Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 4 Aug 2010 22:51:45 +0000 (22:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 4 Aug 2010 22:51:45 +0000 (22:51 +0000)
commit1a1cd2a224a69e3bc697f40236fd6ae7354d8c58
tree4fdf864ebc4607d58a00a2f161751a4de322c840
parentd5e61fcba5dd52764c798eb2bb643c2c5b597a52
parent8bbfc54566e6fd3c1f2444e80b5339f6bbc83ae2
Merge from mainline.